Add a user_time field.

2004-08-23  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkwindow-x11.h (struct _GdkToplevelX11): Add a
	user_time field.

	* gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Update
	toplevel->user_time.
	(show_window_internal): Update the user time when re-mapping a
	toplevel window.  (#150502, Elijah Newren)

diff --git a/ChangeLog b/ChangeLog
index 2d4373e380ebcc343b27a5e825a59672522c6396..80d99a995a7633e1841a3061ba1aad73cab70e1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkwindow-x11.h (struct _GdkToplevelX11): Add a 
+       user_time field.
+
+       * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Update
+       toplevel->user_time.
+       (show_window_internal): Update the user time when re-mapping a
+       toplevel window.  (#150502, Elijah Newren)
+
 2004-08-23  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #150822, reported by Christian Persch

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2d4373e380ebcc343b27a5e825a59672522c6396..80d99a995a7633e1841a3061ba1aad73cab70e1a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2004-08-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkwindow-x11.h (struct _GdkToplevelX11): Add a 
+       user_time field.
+
+       * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Update
+       toplevel->user_time.
+       (show_window_internal): Update the user time when re-mapping a
+       toplevel window.  (#150502, Elijah Newren)
+
 2004-08-23  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #150822, reported by Christian Persch

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2d4373e380ebcc343b27a5e825a59672522c6396..80d99a995a7633e1841a3061ba1aad73cab70e1a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2004-08-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkwindow-x11.h (struct _GdkToplevelX11): Add a 
+       user_time field.
+
+       * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Update
+       toplevel->user_time.
+       (show_window_internal): Update the user time when re-mapping a
+       toplevel window.  (#150502, Elijah Newren)
+
 2004-08-23  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #150822, reported by Christian Persch

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2d4373e380ebcc343b27a5e825a59672522c6396..80d99a995a7633e1841a3061ba1aad73cab70e1a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2004-08-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkwindow-x11.h (struct _GdkToplevelX11): Add a 
+       user_time field.
+
+       * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time): Update
+       toplevel->user_time.
+       (show_window_internal): Update the user time when re-mapping a
+       toplevel window.  (#150502, Elijah Newren)
+
 2004-08-23  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #150822, reported by Christian Persch

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 36c5f1166bd59346d743d7f4dd8a068247f76535..7b983a84961f19fdbac1c98749fadf7ce3ed2118 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -107,6 +107,14 @@ static gpointer parent_class = NULL;
   (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
 
+/* Return whether time1 is considered later than time2 as far as xserver
+ * time is concerned.  Accounts for wraparound.
+ */
+#define XSERVER_TIME_IS_LATER(time1, time2)                        \
+  ( (( time1 > time2 ) && ( time1 - time2 < ((guint32)-1)/2 )) ||  \
+    (( time1 < time2 ) && ( time2 - time1 > ((guint32)-1)/2 ))     \
+  )
+
 GType
 gdk_window_impl_x11_get_type (void)
 {
@@ -1376,6 +1384,9 @@ show_window_internal (GdkWindow *window,
                       gboolean   raise)
 {
   GdkWindowObject *private;
+  GdkDisplay *display;
+  GdkDisplayX11 *display_x11;
+  GdkToplevelX11 *toplevel;
   
   g_return_if_fail (GDK_IS_WINDOW (window));
   
@@ -1400,6 +1411,18 @@ show_window_internal (GdkWindow *window,
       
       g_assert (GDK_WINDOW_IS_MAPPED (window));
 
+      if (GDK_WINDOW_IS_TOPLEVEL (window))
+       {
+         display = gdk_drawable_get_display (window);
+         display_x11 = GDK_DISPLAY_X11 (display);
+         toplevel = _gdk_x11_window_get_toplevel (window);
+
+          if (toplevel->user_time != 0 &&
+             display_x11->user_time != 0 &&
+             XSERVER_TIME_IS_LATER (display_x11->user_time, toplevel->user_time))
+           gdk_x11_window_set_user_time (window, display_x11->user_time);
+       }
+
       if (impl->position_info.mapped)
        {
          gboolean unset_bg = !private->input_only &&
@@ -3685,6 +3708,7 @@ gdk_x11_window_set_user_time (GdkWindow *window,
 {
   GdkDisplay *display;
   GdkDisplayX11 *display_x11;
+  GdkToplevelX11 *toplevel;
   glong timestamp_long = (glong)timestamp;
 
   g_return_if_fail (window != NULL);
@@ -3695,6 +3719,7 @@ gdk_x11_window_set_user_time (GdkWindow *window,
 
   display = gdk_drawable_get_display (window);
   display_x11 = GDK_DISPLAY_X11 (display);
+  toplevel = _gdk_x11_window_get_toplevel (window);
 
   XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
                    gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_USER_TIME"),
@@ -3703,6 +3728,8 @@ gdk_x11_window_set_user_time (GdkWindow *window,
 
   if (timestamp_long != GDK_CURRENT_TIME)
     display_x11->user_time = timestamp_long;
+
+  toplevel->user_time = timestamp_long;
 }
 
 /**

diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdkwindow-x11.h
index a85c873a58125c8113b2a7a30f4248c941aaf16d..b844f6d4b972d55c1f793176197ed9cfe8c7edef 100644 (file)
--- a/gdk/x11/gdkwindow-x11.h
+++ b/gdk/x11/gdkwindow-x11.h
@@ -120,6 +120,9 @@ struct _GdkToplevelX11
   GdkPixmap *icon_window;
   GdkWindow *group_leader;
 
+  /* Time of most recent user interaction. */
+  gulong user_time;
+
   /* We use an extra X window for toplevel windows that we XSetInputFocus()
    * to in order to avoid getting keyboard events redirected to subwindows
    * that might not even be part of this app